Auto merge of #2316 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 25 Jan 2016 18:53:17 +0000 (18:53 +0000)
committerbors <bors@rust-lang.org>
Mon, 25 Jan 2016 18:53:17 +0000 (18:53 +0000)
A few small tweaks to tests were necessary to accomodate rust-lang/rust#29520,
and a few changes were made to the code to account for that as well.


Trivial merge